From c1a7d8b67f2b056b4c6398d0e75f1e7e1e62d95d Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 29 Sep 2005 23:44:34 +0100 Subject: [PATCH] Fix compiler warnings when shadow debugging is enabled. Fix two classes of warnings when debugging of shadow code is enabled: - The type_info field in pfn_info is a long, so use a %lx format specifier when printing it. - Fix a warning about uninitialized use of eff_guest_pte. Signed-off-by: Michael Vrable --- xen/arch/x86/shadow32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/shadow32.c b/xen/arch/x86/shadow32.c index 4b2a417c25..dbdbd52a8a 100644 --- a/xen/arch/x86/shadow32.c +++ b/xen/arch/x86/shadow32.c @@ -1836,7 +1836,7 @@ shadow_mark_mfn_out_of_sync(struct vcpu *v, unsigned long gpfn, } #endif - FSH_LOG("%s(gpfn=%lx, mfn=%lx) c=%08x t=%08x", __func__, + FSH_LOG("%s(gpfn=%lx, mfn=%lx) c=%08x t=%08lx", __func__, gpfn, mfn, page->count_info, page->u.inuse.type_info); // XXX this will require some more thought... Cross-domain sharing and @@ -3017,7 +3017,7 @@ static int check_pte( l1_pgentry_t guest_pte = *p_guest_pte; l1_pgentry_t shadow_pte = *p_shadow_pte; l1_pgentry_t snapshot_pte = p_snapshot_pte ? *p_snapshot_pte : l1e_empty(); - l1_pgentry_t eff_guest_pte; + l1_pgentry_t eff_guest_pte = l1e_empty(); unsigned long mask, eff_guest_pfn, eff_guest_mfn, shadow_mfn; int errors = 0, guest_writable; int page_table_page; @@ -3074,7 +3074,7 @@ static int check_pte( if ( (l1e_get_flags(shadow_pte) & _PAGE_RW ) && !guest_writable ) { - printk("eff_guest_pfn=%lx eff_guest_mfn=%lx shadow_mfn=%lx t=0x%08x page_table_page=%d\n", + printk("eff_guest_pfn=%lx eff_guest_mfn=%lx shadow_mfn=%lx t=%lx page_table_page=%d\n", eff_guest_pfn, eff_guest_mfn, shadow_mfn, frame_table[eff_guest_mfn].u.inuse.type_info, page_table_page); @@ -3085,7 +3085,7 @@ static int check_pte( (l1e_get_flags(shadow_pte) & _PAGE_RW ) && !(guest_writable && (l1e_get_flags(eff_guest_pte) & _PAGE_DIRTY)) ) { - printk("eff_guest_pfn=%lx eff_guest_mfn=%lx shadow_mfn=%lx t=0x%08x page_table_page=%d\n", + printk("eff_guest_pfn=%lx eff_guest_mfn=%lx shadow_mfn=%lx t=%lx page_table_page=%d\n", eff_guest_pfn, eff_guest_mfn, shadow_mfn, frame_table[eff_guest_mfn].u.inuse.type_info, page_table_page); -- 2.30.2